Merge pull request #978 from etienne-lms/minor-build

author danh-arm <[email protected]>

Wed, 28 Jun 2017 12:46:19 +0000 (13:46 +0100)

committer GitHub <[email protected]>

Wed, 28 Jun 2017 12:46:19 +0000 (13:46 +0100)
author danh-arm <[email protected]>
Wed, 28 Jun 2017 12:46:19 +0000 (13:46 +0100)
committer GitHub <[email protected]>
Wed, 28 Jun 2017 12:46:19 +0000 (13:46 +0100)
diff --cc bl1/bl1_fwu.c
Simple merge
diff --cc bl32/sp_min/sp_min_main.c
Simple merge
author	danh-arm <[email protected]>
	Wed, 28 Jun 2017 12:46:19 +0000 (13:46 +0100)
committer	GitHub <[email protected]>
	Wed, 28 Jun 2017 12:46:19 +0000 (13:46 +0100)
		1	2
bl1/bl1_fwu.c	patch \|	diff1 \|	diff2 \|	blob \| history
bl32/sp_min/sp_min_main.c	patch \|	diff1 \|	diff2 \|	blob \| history